tests: Don't use the default stage

https://bugzilla.gnome.org/show_bug.cgi?id=678737

diff --git a/tests/interactive/background-size.js b/tests/interactive/background-size.js
index e5e56f8789dfee79f31e23d6574611c704397762..72112fa91d575d457c0e9bfed22d41deff06a743 100644 (file)
--- a/tests/interactive/background-size.js
+++ b/tests/interactive/background-size.js
@@ -6,11 +6,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.user_resizable = true;
-stage.width = 1024;
-stage.height = 768;
+let stage = new Clutter.Stage({ user_resizable: true, width: 1024, height: 768 });
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ style: 'background: #ffee88;' });
 vbox.add_constraint(new Clutter.BindConstraint({ source: stage,

diff --git a/tests/interactive/border-radius.js b/tests/interactive/border-radius.js
index d3ab718bffcd5e6aa06503236874e8e186ae4b9b..1cd3d04cbbc414ace6d70fcda6b6b4639c8121fc 100644 (file)
--- a/tests/interactive/border-radius.js
+++ b/tests/interactive/border-radius.js
@@ -5,10 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.width = 640;
-stage.height = 480;
+let stage = new Clutter.Stage({ width: 640, height: 480 });
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ width: stage.width,
                               height: stage.height,

diff --git a/tests/interactive/border-width.js b/tests/interactive/border-width.js
index 988166c099ea2bf09d3c11ac48c10bd73165eb38..e575a2f40aa225f8eb06f344958c82fe0e4c0ca6 100644 (file)
--- a/tests/interactive/border-width.js
+++ b/tests/interactive/border-width.js
@@ -5,10 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.width = 640;
-stage.height = 480;
+let stage = new Clutter.Stage({ width: 640, height: 480 });
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ width: stage.width,
                               height: stage.height,

diff --git a/tests/interactive/borders.js b/tests/interactive/borders.js
index d5253d641805924d8d20386fee3d16b319e5268e..88825ed22cc802c0797fad79d0bea8eafeb07a20 100644 (file)
--- a/tests/interactive/borders.js
+++ b/tests/interactive/borders.js
@@ -5,10 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.width = 640;
-stage.height = 480;
+let stage = new Clutter.Stage({ width: 640, height: 480 });
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ width: stage.width,
                               height: stage.height,

diff --git a/tests/interactive/box-layout.js b/tests/interactive/box-layout.js
index 8d3882682099fc972b014cd326ddd2e6572cd5a3..9e9b211239869df958e0bc56ef719fac1a72e627 100644 (file)
--- a/tests/interactive/box-layout.js
+++ b/tests/interactive/box-layout.js
@@ -5,8 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
+let stage = new Clutter.Stage();
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ vertical: true,
                               width: stage.width,

diff --git a/tests/interactive/box-shadows.js b/tests/interactive/box-shadows.js
index a1ae5681d827367687251078458eca37de61b09b..42ed685f7d4d2193eec299bc991c154147bd8142 100644 (file)
--- a/tests/interactive/box-shadows.js
+++ b/tests/interactive/box-shadows.js
@@ -5,10 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.width = 640;
-stage.height = 480;
+let stage = new Clutter.Stage({ width: 640, height: 480 });
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ width: stage.width,
                               height: stage.height,

diff --git a/tests/interactive/calendar.js b/tests/interactive/calendar.js
index 0f041995edeaa8c1909580c618f7c3c88a06d79a..a181aa891d9ed18d9d9eb69b6d6b79b2834349a2 100644 (file)
--- a/tests/interactive/calendar.js
+++ b/tests/interactive/calendar.js
@@ -7,10 +7,8 @@ const St = imports.gi.St;
 const Calendar = imports.ui.calendar;
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.width = stage.height = 400;
-stage.show();
+let stage = new Clutter.Stage({ width: 400, height: 400 });
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ vertical: true,
                               width: stage.width,

diff --git a/tests/interactive/css-fonts.js b/tests/interactive/css-fonts.js
index 6dcec50dc19aca180bf8695f1066f7c8229f2fd2..d23396e5eb938a1619c5510651b2fba21fa53ac5 100644 (file)
--- a/tests/interactive/css-fonts.js
+++ b/tests/interactive/css-fonts.js
@@ -5,8 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
+let stage = new Clutter.Stage();
+UI.init(stage);
 
 let b = new St.BoxLayout({ vertical: true,
                            width: stage.width,

diff --git a/tests/interactive/entry.js b/tests/interactive/entry.js
index ed4b5bd770a3a794caea3140616ae7b6b8e37c60..852aa99c101e3f36c69f0bfcc39836aac28c4535 100644 (file)
--- a/tests/interactive/entry.js
+++ b/tests/interactive/entry.js
@@ -1,19 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const St = imports.gi.St;
 
 const Calendar = imports.ui.calendar;
 const UI = imports.testcommon.ui;
 
-Gtk.init(null, null);
-
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.width = stage.height = 400;
-stage.show();
+let stage = new Clutter.Stage({ width: 400, height: 400 });
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ vertical: true,
                               width: stage.width,

diff --git a/tests/interactive/icons.js b/tests/interactive/icons.js
index 25d1dfc091f948d2d7cfd52b6af452bec70d92fb..f6b8d4a8e26339691ffd255b513d71722b55e2e6 100644 (file)
--- a/tests/interactive/icons.js
+++ b/tests/interactive/icons.js
@@ -5,11 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-
-stage.width = 400;
-stage.height = 700;
+let stage = new Clutter.Stage();
+UI.init(stage);
 
 let b = new St.BoxLayout({ vertical: true,
                            width: stage.width,

diff --git a/tests/interactive/inline-style.js b/tests/interactive/inline-style.js
index c9cf9c72c2b1007fe7e19e733642f813cc67a4f3..e8e533aea645ccae5f723703cf5de12860c23a48 100644 (file)
--- a/tests/interactive/inline-style.js
+++ b/tests/interactive/inline-style.js
@@ -5,8 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
+let stage = new Clutter.Stage();
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ vertical: true,
                               width: stage.width,

diff --git a/tests/interactive/scroll-view-sizing.js b/tests/interactive/scroll-view-sizing.js
index 1f795b70b4305ce0a379ca476f94bd16c9ac14ee..7ccd6d88a4fd306548818b5683d289ec1e356ee2 100644 (file)
--- a/tests/interactive/scroll-view-sizing.js
+++ b/tests/interactive/scroll-view-sizing.js
@@ -251,10 +251,8 @@ SizingIllustrator.prototype = {
 
 /****************************************************************************/
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.width = 600;
-stage.height = 600;
+let stage = new Clutter.Stage({ width: 600, height: 600 });
+UI.init(stage);
 
 let mainBox = new St.BoxLayout({ width: stage.width,
                                 height: stage.height,

diff --git a/tests/interactive/scrolling.js b/tests/interactive/scrolling.js
index e03a4edcf3bb8943acae5e4a8487f220d1031244..3050f579d398daca3e93930c2ffb2eadad4e36b3 100644 (file)
--- a/tests/interactive/scrolling.js
+++ b/tests/interactive/scrolling.js
@@ -6,8 +6,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
+let stage = new Clutter.Stage();
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ vertical: true,
                               width: stage.width,

diff --git a/tests/interactive/table.js b/tests/interactive/table.js
index 31771db9ca5f493b95a3ea7babecab6e46a80a26..b0ba369890fa433126e17a3e2a6a7d5dcb381b4e 100644 (file)
--- a/tests/interactive/table.js
+++ b/tests/interactive/table.js
@@ -5,9 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
-stage.width = stage.height = 600;
+let stage = new Clutter.Stage({ width: 600, height: 600 });
+UI.init(stage);
 
 let vbox = new St.BoxLayout({ vertical: true,
                               width: stage.width,

diff --git a/tests/interactive/transitions.js b/tests/interactive/transitions.js
index 0409245911cdd5a24fe34cffcace644ef0c9870a..ec6fc81850de3a5b8bedbeb86808ebb60053b4ea 100644 (file)
--- a/tests/interactive/transitions.js
+++ b/tests/interactive/transitions.js
@@ -5,8 +5,8 @@ const St = imports.gi.St;
 
 const UI = imports.testcommon.ui;
 
-UI.init();
-let stage = Clutter.Stage.get_default();
+let stage = new Clutter.Stage();
+UI.init(stage);
 
 let hbox = new St.BoxLayout({ name: 'transition-container',
                               reactive: true,

diff --git a/tests/testcommon/ui.js b/tests/testcommon/ui.js
index 56a8aeccde124b669dd469d5a2195313edeb2cf6..bc88db8d896c5599a33f440c5e6fc4f95f9dcef1 100644 (file)
--- a/tests/testcommon/ui.js
+++ b/tests/testcommon/ui.js
@@ -3,16 +3,13 @@
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 
 const Environment = imports.ui.environment;
 
-function init() {
+function init(stage) {
     Environment.init();
-
-    let stage = Clutter.Stage.get_default();
-    let context = St.ThemeContext.get_for_stage (stage);
+    let context = St.ThemeContext.get_for_stage(stage);
     let stylesheetPath = GLib.getenv("GNOME_SHELL_TESTSDIR") + "/testcommon/test.css";
-    let theme = new St.Theme ({ application_stylesheet: stylesheetPath });
-    context.set_theme (theme);
+    let theme = new St.Theme({ application_stylesheet: stylesheetPath });
+    context.set_theme(theme);
 }